[Attn Masks] Non-vmap default for attention masks
#41852
+114
−277
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The docs for this PR live here. All of your documentation changes will be reflected on that endpoint. The docs are available until 30 days after the last update. |
4 tasks
vasqu
changed the title
WIP][Masking] Non-vmap default for attention masksAttn Masks] Non-vmap default for attention masks
vasqu
commented
Oct 29, 2025
| return cache | ||
|
|
||
|
|
||
| def sdpa_mask_without_vmap( |
There was a problem hiding this comment.
No longer needed as vmap was the reason we needed this workaround in the first place
vasqu
commented
Oct 29, 2025
| NOTE: It is important to keep an index-based version for non-vmap expansion. | ||
| """ | ||
| return q_idx.new_ones((), dtype=torch.bool) | ||
| return q_idx >= 0 |
There was a problem hiding this comment.
As noted above, for non-vmap we need this as index based version
vasqu
commented
Oct 29, 2025
vasqu
commented
Oct 29, 2025
| causal_mask |= torch.all(~causal_mask, dim=-1, keepdim=True) | ||
| return causal_mask | ||
|
|
||
| attention_mask = attention_mask | torch.all(~attention_mask, dim=-1, keepdim=True) |
There was a problem hiding this comment.
I encountered issues with the inplace version where we'd need a clone (e.g. when using swa). This is safer
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Non-vmap creation of masks. These work with all our base masks and we only default back to vmap when using patterns we cannot guarantee (i.e. additional and/or masks).
Note:
Fixes #41639
cc @jiqing-feng @IlyasMoutawwakil